From: robertl <robertl>
Date: Thu, 24 Dec 2009 20:37:48 +0000 (+0000)
Subject: Improve detection of newer Holux GR241 firmware.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~199^2~87
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=4f467e348121b292c6218e5a49f9950ea83ec602;p=gpsbabel.git

Improve detection of newer Holux GR241 firmware.
---

diff --git a/mtk_logger.c b/mtk_logger.c
index dec0cba47..dea987f24 100644
--- a/mtk_logger.c
+++ b/mtk_logger.c
@@ -1398,13 +1398,15 @@ static void file_read(void) {
                mtk_info.track_event |= MTK_EVT_WAYPT;
 
             k = 16;
-            // m241  - HOLUXGR241LOGGER or HOLUXGR241WAYPNT
+            // m241  - HOLUXGR241LOGGER or HOLUXGR241WAYPNT or HOLUXGR241LOGGER<SP><SP><SP><SP>
             // gr245 - HOLUXGR245LOGGER<SP><SP><SP><SP> or HOLUXGR245WAYPNT<SP><SP><SP><SP>
+            if ((mtk_device != HOLUX_GR245) && (memcmp(&buf[i], "HOLUXGR245", 10) == 0)) {
+               dbg(2, "Detected Holux GR245 !\n");
+               holux245_init();
+            }
+
+            // skip the 4 spaces that may occur on every device
             if ( memcmp(&buf[i+16], "    ", 4) == 0 ){ // Assume loglen >= 20...
-               if ( mtk_device != HOLUX_GR245 ){
-                 dbg(2, "Detected Holux GR245 !\n");
-                 holux245_init();
-               }
                k += 4;
             }   
          } else if  ( buf[i] == 0xff && buf[i+1] == 0xff  && buf[i+2] == 0xff && buf[i+3] == 0xff